Merge pull request #523 from jcastillo-arm/jc/genfw-791

ARM platforms: rationalise memory attributes of shared memory

diff --cc include/plat/arm/common/arm_def.h
Simple merge

diff --cc include/plat/arm/css/common/css_def.h
index 3d6884a845276699e0181638702ca621d3012b5a,7a5d1939b76118ce2d73217e8d873fd20da6acf3..f92126ba96d60148f106bce6cf5935a52968ea6b
--- 1/include/plat/arm/css/common/css_def.h
--- 2/include/plat/arm/css/common/css_def.h
+++ b/include/plat/arm/css/common/css_def.h
@@@ -139,10 -115,7 +137,8 @@@
  #define SCP_BL2_BASE                  BL31_BASE
  
  #define SCP_BL2U_BASE                 BL31_BASE
 +#endif /* CSS_LOAD_SCP_IMAGES */
  
- #define PLAT_ARM_SHARED_RAM_CACHED    MHU_PAYLOAD_CACHED
- 
  /* Load address of Non-Secure Image for CSS platform ports */
  #define PLAT_ARM_NS_IMAGE_OFFSET      0xE0000000
  

diff --cc plat/arm/board/fvp/include/platform_def.h
Simple merge

diff --cc plat/arm/css/common/css_scp_bootloader.c
Simple merge

diff --cc plat/arm/css/common/css_scpi.c
Simple merge